[CP Staging] Only show the VBBA payment option for expense reports #31841

mountiny · 2023-11-24T16:30:04Z

Details

The language for paying with bank account as a business or with a Wallet for IOU is the same - Pay With Expensify. Now users have option to pay the IOU reports with business bank account too which creates a workspace and we are showing two same buttons for them, which should not be the case

Fixed Issues

$ #31829

Tests

Have two users with US locale
request money in USD from one to another
as the payer click on the dropdown on the Settlement button
verify there is only one Pay With Expensify option
choose that option
Click to pay with expensify
Verify you can see three options of how to pay

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
I verified that if a function's arguments changed that all usages have also been updated correctly
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG))
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

tested on web, changes are platform agnostic

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2023-11-24T16:40:42Z

@situchan Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

mountiny · 2023-11-24T16:41:13Z

src/components/SettlementButton.js

+        if (isExpenseReport) {
+            buttonOptions.push(paymentMethods[CONST.IOU.PAYMENT_TYPE.VBBA]);
+        }


This was not supposed to be added as an option in case of non expense reports

NAB: Can we update like this so 2 options can never be shown together in the future

if (isExpenseReport) { buttonOptions.push(paymentMethods[CONST.IOU.PAYMENT_TYPE.VBBA]); } else if (currency === CONST.CURRENCY.USD) { buttonOptions.push(paymentMethods[CONST.IOU.PAYMENT_TYPE.EXPENSIFY]); } buttonOptions.push(paymentMethods[CONST.IOU.PAYMENT_TYPE.ELSEWHERE]);

situchan · 2023-11-24T18:50:34Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

msafari.mov

MacOS: Chrome / Safari

web.mov

web2.mov

MacOS: Desktop

situchan

I think #31837 can be fixed in separate PR though it's similar but different root cause.

melvin-bot · 2023-11-24T18:51:59Z

@rlinoz Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

OSBotify · 2023-11-24T19:22:34Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

…ports [CP Staging] Only show the VBBA payment option for expense reports (cherry picked from commit eb5de8e)

OSBotify · 2023-11-24T20:03:54Z

🚀 Cherry-picked to staging by https://github.com/luacmartins in version: 1.4.3-5 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

luacmartins · 2023-11-24T20:28:18Z

Hmm I can still see both options in an IOU report in staging v1.4.3-5

situchan · 2023-11-24T20:31:58Z

@luacmartins it's different bug - #31837

luacmartins · 2023-11-24T20:33:33Z

I'm not sure that I follow. I can still see 2 options

situchan · 2023-11-24T20:43:19Z

#31829 is about:

#31837 is about:

luacmartins · 2023-11-24T20:52:55Z

Ah I see, thanks for clarifying!

OSBotify · 2023-11-27T19:06:03Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.4.3-11 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

Only show the VBBA payment option for expense reports

382cd5a

mountiny self-assigned this Nov 24, 2023

mountiny marked this pull request as ready for review November 24, 2023 16:40

mountiny requested a review from a team as a code owner November 24, 2023 16:40

melvin-bot bot requested review from situchan and removed request for a team November 24, 2023 16:40

mountiny commented Nov 24, 2023

View reviewed changes

This comment was marked as off-topic.

Sign in to view

situchan approved these changes Nov 24, 2023

View reviewed changes

melvin-bot bot requested a review from rlinoz November 24, 2023 18:51

luacmartins approved these changes Nov 24, 2023

View reviewed changes

luacmartins merged commit eb5de8e into main Nov 24, 2023
17 of 20 checks passed

luacmartins deleted the vit-onlyShowVBBAForExpenseReports branch November 24, 2023 19:17

OSBotify pushed a commit that referenced this pull request Nov 24, 2023

Merge pull request #31841 from Expensify/vit-onlyShowVBBAForExpenseRe…

627fe4f

…ports [CP Staging] Only show the VBBA payment option for expense reports (cherry picked from commit eb5de8e)

github-actions bot mentioned this pull request Nov 24, 2023

Deploy Checklist: New Expensify 2023-11-23 #31786

Closed

60 tasks

melvin-bot bot mentioned this pull request Nov 27, 2023

[$500] [HOLD for payment 2023-12-06] Chat - Encountering a duplicate 'Pay with Expensify' option when the admin opens the dropdown #31829

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[CP Staging] Only show the VBBA payment option for expense reports #31841

[CP Staging] Only show the VBBA payment option for expense reports #31841

mountiny commented Nov 24, 2023 •

edited

Loading

melvin-bot bot commented Nov 24, 2023

mountiny Nov 24, 2023

situchan Nov 24, 2023 •

edited

Loading

This comment was marked as off-topic.

situchan commented Nov 24, 2023

situchan left a comment •

edited

Loading

melvin-bot bot commented Nov 24, 2023

OSBotify commented Nov 24, 2023

OSBotify commented Nov 24, 2023

luacmartins commented Nov 24, 2023

situchan commented Nov 24, 2023

luacmartins commented Nov 24, 2023

situchan commented Nov 24, 2023

luacmartins commented Nov 24, 2023

OSBotify commented Nov 27, 2023

[CP Staging] Only show the VBBA payment option for expense reports #31841

[CP Staging] Only show the VBBA payment option for expense reports #31841

Conversation

mountiny commented Nov 24, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Nov 24, 2023

mountiny Nov 24, 2023

Choose a reason for hiding this comment

situchan Nov 24, 2023 • edited Loading

Choose a reason for hiding this comment

This comment was marked as off-topic.

situchan commented Nov 24, 2023

Reviewer Checklist

Screenshots/Videos

situchan left a comment • edited Loading

Choose a reason for hiding this comment

melvin-bot bot commented Nov 24, 2023

OSBotify commented Nov 24, 2023

OSBotify commented Nov 24, 2023

luacmartins commented Nov 24, 2023

situchan commented Nov 24, 2023

luacmartins commented Nov 24, 2023

situchan commented Nov 24, 2023

luacmartins commented Nov 24, 2023

OSBotify commented Nov 27, 2023

mountiny commented Nov 24, 2023 •

edited

Loading

situchan Nov 24, 2023 •

edited

Loading

situchan left a comment •

edited

Loading